| commit | 88bf5716b2ea27d90ae93a2f12525a0e143e3b39 | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <gitster@pobox.com> | Sun Sep 10 08:39:23 2017 |
| committer | Junio C Hamano <gitster@pobox.com> | Sun Sep 10 08:39:23 2017 |
| tree | 0ddd74fc574f9dc6ccd7667437b0f60b5fb6a94a | |
| parent | bc39b7db11be3ba4e93e34f706b8a774e523bf1b [diff] [blame] |
Autogenerated HTML docs for v2.14.1-536-g68672
diff --git a/git-merge.txt b/git-merge.txt index 615e6ba..4df6431 100644 --- a/git-merge.txt +++ b/git-merge.txt
@@ -141,7 +141,7 @@ would result from the merge already.) If all named commits are already ancestors of `HEAD`, 'git merge' -will exit early with the message "Already up-to-date." +will exit early with the message "Already up to date." FAST-FORWARD MERGE ------------------